From 8e62cdfefec722038e37fdb04c4ea22f13436fff Mon Sep 17 00:00:00 2001 From: KUWAMURA Shin'ya Date: Sat, 16 Jul 2011 09:17:20 +0100 Subject: [PATCH] [IA64] Fix ia64 build for 22396:c1b7aae86cf5 The header xen/include/xen/wait.h conflicts with xen/include/asm-ia64/linux/wait.h on ia64. This patch fixes it. # xen/include/xen/wait.h introduced by 22396:c1b7aae86cf5. Signed-off-by: KUWAMURA Shin'ya --- xen/include/asm-ia64/linux-xen/linux/README.origin | 1 + xen/include/asm-ia64/{ => linux-xen}/linux/completion.h | 4 ++++ xen/include/asm-ia64/linux-xen/linux/kobject.h | 2 ++ xen/include/asm-ia64/linux/README.origin | 1 - 4 files changed, 7 insertions(+), 1 deletion(-) rename xen/include/asm-ia64/{ => linux-xen}/linux/completion.h (97%) diff --git a/xen/include/asm-ia64/linux-xen/linux/README.origin b/xen/include/asm-ia64/linux-xen/linux/README.origin index 7639720a9d..fa59162b6e 100644 --- a/xen/include/asm-ia64/linux-xen/linux/README.origin +++ b/xen/include/asm-ia64/linux-xen/linux/README.origin @@ -16,6 +16,7 @@ oprofile.h -> linux/include/linux/oprofile.h pci.h -> linux/include/linux/pci.h kobject.h -> linux/include/linux/kobject.h device.h -> linux/include/linux/device.h +completion.h -> linux/include/linux/completion.h # The files below are from Linux-2.6.21 cpu.h -> linux/include/linux/cpu.h diff --git a/xen/include/asm-ia64/linux/completion.h b/xen/include/asm-ia64/linux-xen/linux/completion.h similarity index 97% rename from xen/include/asm-ia64/linux/completion.h rename to xen/include/asm-ia64/linux-xen/linux/completion.h index 268c5a4a2b..2054930088 100644 --- a/xen/include/asm-ia64/linux/completion.h +++ b/xen/include/asm-ia64/linux-xen/linux/completion.h @@ -12,7 +12,9 @@ struct completion { unsigned int done; +#ifndef XEN wait_queue_head_t wait; +#endif }; #define COMPLETION_INITIALIZER(work) \ @@ -39,7 +41,9 @@ struct completion { static inline void init_completion(struct completion *x) { x->done = 0; +#ifndef XEN init_waitqueue_head(&x->wait); +#endif } extern void FASTCALL(wait_for_completion(struct completion *)); diff --git a/xen/include/asm-ia64/linux-xen/linux/kobject.h b/xen/include/asm-ia64/linux-xen/linux/kobject.h index d072d2a90c..9ecd705d22 100644 --- a/xen/include/asm-ia64/linux-xen/linux/kobject.h +++ b/xen/include/asm-ia64/linux-xen/linux/kobject.h @@ -58,7 +58,9 @@ struct kobject { struct kset * kset; struct kobj_type * ktype; struct dentry * dentry; +#ifndef XEN wait_queue_head_t poll; +#endif }; extern int kobject_set_name(struct kobject *, const char *, ...) diff --git a/xen/include/asm-ia64/linux/README.origin b/xen/include/asm-ia64/linux/README.origin index 527c2d3292..f6a853de91 100644 --- a/xen/include/asm-ia64/linux/README.origin +++ b/xen/include/asm-ia64/linux/README.origin @@ -24,7 +24,6 @@ topology.h -> linux/include/linux/topology.h wait.h -> linux/include/linux/wait.h # The files below are from Linux-2.6.19 -completion.h -> linux/include/linux/completion.h ioport.h -> linux/include/linux/ioport.h klist.h -> linux/include/linux/klist.h kref.h -> linux/include/linux/kref.h -- 2.30.2